Use `mod` where possible

Example:

```
use std::fmt;
use std::fmt::Show;
```

becomes

```
use std::fmt::{mod, Show};
```

diff --git a/src/cargo/core/errors.rs b/src/cargo/core/errors.rs
index 695ecba9de63ecfdb52c77abc3eb0ef48ac26d7e..33dd5bbe2d7b84319db10c0141397948baa71645 100644 (file)
--- a/src/cargo/core/errors.rs
+++ b/src/cargo/core/errors.rs
@@ -1,5 +1,4 @@
-use std::fmt;
-use std::fmt::{Show,Formatter};
+use std::fmt::{mod, Show, Formatter};
 use std::io::IoError;
 
 /*

diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs
index 6d7fe2dd2360f161c19ad93d889946f1e8db9e7c..fe590f119eb3e797b0c9f862fa774e4385eee967 100644 (file)
--- a/src/cargo/core/manifest.rs
+++ b/src/cargo/core/manifest.rs
@@ -1,7 +1,6 @@
 use std::hash;
 use std::result;
-use std::fmt;
-use std::fmt::{Show,Formatter};
+use std::fmt::{mod, Show, Formatter};
 use semver::Version;
 use serialize::{Encoder,Encodable};
 use core::source::SourceId;

diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs
index 516866d3ce7e84613b4bb07c8a01037e4530b9ce..0ae1b4be785a4110d6a4c3e970fa77557def36be 100644 (file)
--- a/src/cargo/core/package.rs
+++ b/src/cargo/core/package.rs
@@ -1,5 +1,4 @@
-use std::fmt::{Show,Formatter};
-use std::fmt;
+use std::fmt::{mod, Show, Formatter};
 use std::slice;
 use semver::Version;
 

diff --git a/src/cargo/core/package_id.rs b/src/cargo/core/package_id.rs
index 8f7f9933a061a3f93fe3d33be1b7fb0ac8b8bdb2..6f70ad35349a61870d95b5fc96c090962436f130 100644 (file)
--- a/src/cargo/core/package_id.rs
+++ b/src/cargo/core/package_id.rs
@@ -1,7 +1,6 @@
 use semver;
 use std::hash::Hash;
-use std::fmt;
-use std::fmt::{Show,Formatter};
+use std::fmt::{mod, Show, Formatter};
 use collections::hash;
 use serialize::{
     Encodable,

diff --git a/src/cargo/core/shell.rs b/src/cargo/core/shell.rs
index 5d98b4c900f7baba67dc7408a5e614cf301cfff5..5e93c0cb4163bd32676372ef6323f2efd2c54bbf 100644 (file)
--- a/src/cargo/core/shell.rs
+++ b/src/cargo/core/shell.rs
@@ -1,5 +1,4 @@
-use term;
-use term::{Terminal,color};
+use term::{mod, Terminal, color};
 use term::color::{Color, BLACK, RED, GREEN, YELLOW};
 use term::attr::{Attr, Bold};
 use std::io::{IoResult, stderr};

diff --git a/src/cargo/core/source.rs b/src/cargo/core/source.rs
index ae415e130d7cbd4c10fdaa69fe6fc330e230071a..69767edc4baeac39a91b7b26572234275bd99c6b 100644 (file)
--- a/src/cargo/core/source.rs
+++ b/src/cargo/core/source.rs
@@ -1,8 +1,7 @@
 use std::cmp::Ordering;
 use std::collections::HashMap;
 use std::collections::hashmap::{Values, MutEntries};
-use std::fmt::{Show, Formatter};
-use std::fmt;
+use std::fmt::{mod, Show, Formatter};
 use std::hash;
 use std::iter;
 use std::mem;

diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
index 482872b4d1a2d7ba23ed3789e0b38b4113705fe1..db4e6912e64b5772f76edeccf6c8297d1eac0f90 100644 (file)
--- a/src/cargo/lib.rs
+++ b/src/cargo/lib.rs
@@ -23,8 +23,7 @@ extern crate toml;
 
 use std::os;
 use std::io::stdio::{stdout_raw, stderr_raw};
-use std::io::{stdout, stderr};
-use std::io;
+use std::io::{mod, stdout, stderr};
 use serialize::{Decoder, Encoder, Decodable, Encodable, json};
 use docopt::FlagParser;
 

diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
index d7c44c19efbc22ed5aab4a2eabbda8e378ac62e9..1c35a0f2ea96b76474de2eb688328061b178a328 100644 (file)
--- a/src/cargo/ops/cargo_compile.rs
+++ b/src/cargo/ops/cargo_compile.rs
@@ -28,13 +28,11 @@ use std::result;
 
 use core::registry::PackageRegistry;
 use core::{MultiShell, Source, SourceId, PackageSet, Target, PackageId};
-use core::{Package, Summary, Resolve};
-use core::resolver;
+use core::{Package, Summary, Resolve, resolver};
 use ops;
 use sources::{PathSource};
 use util::config::{Config, ConfigValue};
-use util::{CargoResult, Wrap, config, internal, human, ChainError};
-use util::profile;
+use util::{CargoResult, Wrap, config, internal, human, ChainError, profile};
 
 pub struct CompileOptions<'a> {
     pub update: bool,

diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs
index 1e10f53d39f297e4ff06e865e79e808fb5e42726..4875034d1b1076e8b6cb7987f6533e183347ac9a 100644 (file)
--- a/src/cargo/ops/cargo_generate_lockfile.rs
+++ b/src/cargo/ops/cargo_generate_lockfile.rs
@@ -3,8 +3,7 @@ use std::collections::HashSet;
 use std::io::File;
 
 use serialize::{Encodable, Decodable};
-use toml::Encoder;
-use toml as toml;
+use toml::{mod, Encoder};
 
 use core::registry::PackageRegistry;
 use core::{MultiShell, Source, Resolve, resolver, Package, SourceId};

diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
index c9f1ccdf0071cd8104c08b8fbea21bf7f3017a92..53b462ae29cb74ffb30032e383427d412f19ff84 100644 (file)
--- a/src/cargo/ops/cargo_new.rs
+++ b/src/cargo/ops/cargo_new.rs
@@ -1,6 +1,5 @@
 use std::os;
-use std::io;
-use std::io::{fs, File};
+use std::io::{mod, fs, File};
 
 use util::{CargoResult, human, ChainError, process};
 use core::shell::MultiShell;

diff --git a/src/cargo/ops/cargo_read_manifest.rs b/src/cargo/ops/cargo_read_manifest.rs
index e25e108b7d6d89da257b261eaacf379082cf236e..a3799957a8585ef5c800d044424467d15bef5e0e 100644 (file)
--- a/src/cargo/ops/cargo_read_manifest.rs
+++ b/src/cargo/ops/cargo_read_manifest.rs
@@ -1,8 +1,7 @@
 use std::collections::HashSet;
 use std::io::{File, fs};
-use util;
 use core::{Package,Manifest,SourceId};
-use util::{CargoResult, human};
+use util::{mod, CargoResult, human};
 use util::important_paths::find_project_manifest_exact;
 use util::toml::{Layout, project_layout};
 

diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs
index 45bc56b37a76a3d6cae9b52b0c2e4911566cad62..360afb88f45e628e7fa476a8a39e585b19665b2b 100644 (file)
--- a/src/cargo/ops/cargo_rustc/context.rs
+++ b/src/cargo/ops/cargo_rustc/context.rs
@@ -3,8 +3,7 @@ use std::str;
 use semver::Version;
 
 use core::{SourceMap, Package, PackageId, PackageSet, Resolve, Target};
-use util;
-use util::{CargoResult, ChainError, internal, Config, profile, Require};
+use util::{mod, CargoResult, ChainError, internal, Config, profile, Require};
 
 use super::{Kind, KindPlugin, KindTarget, Compilation};
 use super::layout::{Layout, LayoutProxy};

diff --git a/src/cargo/ops/cargo_rustc/layout.rs b/src/cargo/ops/cargo_rustc/layout.rs
index fdca3fec5e9143e13591c853cb631a1d81790956..0e612f33d49ee67d74b2b4bba046c32b0d528dc8 100644 (file)
--- a/src/cargo/ops/cargo_rustc/layout.rs
+++ b/src/cargo/ops/cargo_rustc/layout.rs
@@ -46,8 +46,7 @@
 //!     old-fingerprint/
 //! ```
 
-use std::io;
-use std::io::{fs, IoResult};
+use std::io::{mod, fs, IoResult};
 
 use core::Package;
 use util::hex::short_hash;

diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs
index 0fa87f2bb5bc7a3be70102052a7e777ea7b9ffd6..4d589d62c818041eed92baef94e9cfb8c5f3b684 100644 (file)
--- a/src/cargo/sources/git/source.rs
+++ b/src/cargo/sources/git/source.rs
@@ -1,5 +1,4 @@
-use std::fmt::{Show,Formatter};
-use std::fmt;
+use std::fmt::{mod, Show, Formatter};
 use std::hash::Hasher;
 use std::hash::sip::SipHasher;
 use std::mem;

diff --git a/src/cargo/sources/git/utils.rs b/src/cargo/sources/git/utils.rs
index b92517514c325fa77ba814c37558eed01e3606fd..b673d631d267cddcd468617bf4b6321a25f2dd74 100644 (file)
--- a/src/cargo/sources/git/utils.rs
+++ b/src/cargo/sources/git/utils.rs
@@ -1,5 +1,4 @@
-use std::fmt;
-use std::fmt::{Show,Formatter};
+use std::fmt::{mod, Show, Formatter};
 use std::io::{UserDir};
 use std::io::fs::{mkdir_recursive,rmdir_recursive};
 use serialize::{Encodable,Encoder};

diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
index 0ef3484f9ea6ecde6a1717168e76fd3a3757b75a..a81ea31aae90f09a525d8da2157607e779b1aa98 100644 (file)
--- a/src/cargo/sources/path.rs
+++ b/src/cargo/sources/path.rs
@@ -1,6 +1,5 @@
 use std::cmp;
-use std::fmt::{Show, Formatter};
-use std::fmt;
+use std::fmt::{mod, Show, Formatter};
 use std::io::fs;
 use glob::Pattern;
 

diff --git a/src/cargo/util/errors.rs b/src/cargo/util/errors.rs
index a3ad366b82cfdf29b20efba81e3bec89d34be1de..5ec2f711c6bcf92ed679316e4c3da27047b040f3 100644 (file)
--- a/src/cargo/util/errors.rs
+++ b/src/cargo/util/errors.rs
@@ -1,7 +1,6 @@
 use std::io::process::{ProcessOutput, ProcessExit, ExitStatus, ExitSignal};
 use std::io::IoError;
-use std::fmt;
-use std::fmt::{Show, Formatter, FormatError};
+use std::fmt::{mod, Show, Formatter, FormatError};
 use std::str;
 
 use docopt;

diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs
index da88b33f439f6de8ff5cafe4ff76e9018d5487ea..46a020b8fa46419b2525355edf34a84ab9c89b17 100644 (file)
--- a/src/cargo/util/process_builder.rs
+++ b/src/cargo/util/process_builder.rs
@@ -1,5 +1,4 @@
-use std::fmt;
-use std::fmt::{Show, Formatter};
+use std::fmt::{mod, Show, Formatter};
 use std::os;
 use std::c_str::CString;
 use std::io::process::{Command, ProcessOutput, InheritFd};

diff --git a/src/cargo/util/to_url.rs b/src/cargo/util/to_url.rs
index d130daa72937f83d42909ecc9c67a45130111bc8..93df2b30c8a0c537fb89d038227c83792fe62fb5 100644 (file)
--- a/src/cargo/util/to_url.rs
+++ b/src/cargo/util/to_url.rs
@@ -1,5 +1,4 @@
-use url;
-use url::{Url, UrlParser};
+use url::{mod, Url, UrlParser};
 
 pub trait ToUrl {
     fn to_url(self) -> Result<Url, String>;